x11: Fix a trap mixup

There was a return between a push/pop of an error trap, and
this managed to trigger the 'unpopped trap' warning in the
displayclose test now. Fix this.

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 2fd413c08202f3d91552f905a93564ee0d879d44..078a839bcfdbd23d6499344ea39cd9a48d0f7c1c 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -353,7 +353,10 @@ get_device_ids (GdkDisplay    *display,
   prop = XInternAtom (GDK_DISPLAY_XDISPLAY (display), "Device Product ID", True);
 
   if (prop == None)
-    return 0;
+    {
+      gdk_x11_display_error_trap_pop_ignored (display);
+      return 0;
+    }
 
   rc = XIGetProperty (GDK_DISPLAY_XDISPLAY (display),
                       info->deviceid, prop,